Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement some parts of ControlBar #1010

Merged
merged 1 commit into from
Oct 15, 2023

Conversation

jonwil
Copy link
Contributor

@jonwil jonwil commented Oct 13, 2023

No description provided.

@jonwil jonwil requested review from feliwir and xezon October 13, 2023 13:44
@jonwil jonwil force-pushed the gamewindow12 branch 2 times, most recently from 8bcc8b0 to 7adfa17 Compare October 13, 2023 13:58
src/game/client/gui/controlbar/controlbarscheme.cpp Outdated Show resolved Hide resolved
src/game/client/gui/controlbar/controlbarscheme.cpp Outdated Show resolved Hide resolved
src/game/client/gui/controlbar/controlbarscheme.cpp Outdated Show resolved Hide resolved
src/game/client/gui/controlbar/controlbarscheme.cpp Outdated Show resolved Hide resolved
src/game/client/gui/controlbar/controlbar.cpp Outdated Show resolved Hide resolved
src/game/client/gui/controlbar/controlbar.cpp Outdated Show resolved Hide resolved
src/game/client/gui/controlbar/controlbar.cpp Show resolved Hide resolved
src/game/client/gui/controlbar/controlbar.cpp Show resolved Hide resolved
src/game/client/gui/controlbar/controlbar.cpp Outdated Show resolved Hide resolved
@xezon
Copy link
Contributor

xezon commented Oct 14, 2023

It is not possible purchase more than 1 Generals Ability.

shot_20231014_154201_1

@xezon
Copy link
Contributor

xezon commented Oct 14, 2023

Hotkeys from Strings no longer work.

@xezon
Copy link
Contributor

xezon commented Oct 14, 2023

Requirements in Tool tip strings lists INI object names, not localized names.

shot_20231014_161003_1

@jonwil
Copy link
Contributor Author

jonwil commented Oct 14, 2023

Fixed tooltip requirement strings.

@jonwil
Copy link
Contributor Author

jonwil commented Oct 15, 2023

Fixed generals ability.

@jonwil
Copy link
Contributor Author

jonwil commented Oct 15, 2023

Fixed hot keys.

@jonwil jonwil requested a review from xezon October 15, 2023 01:33
@codecov-commenter
Copy link

codecov-commenter commented Oct 15, 2023

Codecov Report

Attention: 1537 lines in your changes are missing coverage. Please review.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Files Coverage Δ
src/game/client/gui/controlbar/controlbarscheme.h 0.00% <ø> (ø)
src/game/client/gui/gadget/gadgetpushbutton.h 0.00% <ø> (ø)
src/game/client/gui/gamewindow.h 0.00% <ø> (ø)
src/game/client/messagestream/hotkey.h 0.00% <ø> (ø)
src/game/common/gameengine.cpp 0.00% <ø> (ø)
src/game/logic/system/gamelogic.cpp 0.00% <ø> (ø)
src/game/logic/system/gamelogicdispatch.cpp 0.00% <ø> (ø)
...rc/game/client/gui/controlbar/controlbarbeacon.cpp 0.00% <0.00%> (ø)
...me/client/gui/controlbar/controlbarmultiselect.cpp 0.00% <0.00%> (ø)
.../game/client/gui/controlbar/controlbarocltimer.cpp 0.00% <0.00%> (ø)
... and 20 more

... and 10 files with indirect coverage changes

📢 Thoughts on this report? Let us know!.

Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Control Bar works.

@jonwil jonwil merged commit eb9830e into TheAssemblyArmada:develop Oct 15, 2023
7 checks passed
@jonwil jonwil deleted the gamewindow12 branch October 15, 2023 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants